Auto merge of #2047 - akiss77:makefile-cfg-optimize, r=alexcrichton
authorbors <bors@rust-lang.org>
Fri, 9 Oct 2015 17:03:44 +0000 (17:03 +0000)
committerbors <bors@rust-lang.org>
Fri, 9 Oct 2015 17:03:44 +0000 (17:03 +0000)
commit77414d2e4558e60e54469e77df62684b1025b9c2
tree74fbf9133a023c5520f6254d39d0b273e325bdcb
parent1e97e2dde37b20cf47bd574e5f86133c687b4e91
parent040942265ef4b82827547ac26e5fc04895ce0b87
Auto merge of #2047 - akiss77:makefile-cfg-optimize, r=alexcrichton

Until now, there was a CFG_DISABLE_OPTIMIZE that controlled whether `--release` is passed to cargo during the build, and a CFG_ENABLE_OPTIMIZE that controlled where `make install` (among others) looked for the already built cargo executable. Unfortunately, if none of these were specified, `make all` built a release cargo but `make install` looked for it under `$(CFG_TARGET)/debug` (and aborted with "Please run `make` first"). This patch keeps CFG_DISABLE_OPTIMIZE only and uses it consistently.